From cb14ce3dfce1301a088ef68c8b5b2b41387641a1 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 8 Dec 2017 00:21:38 +0100 Subject: [PATCH] librbd: Do not instantiate TrimRequest template class We include TrimRequest.cc in librbd tests at two places: - operation/test_mock_TrimRequest.cc - operation/test_mock_ResizeRequest.cc That causes linking errors when doing the builds because some of the instantiated classes are defined twice. We can fix this by not instantiating the template class in the TrimReqeust.cc file when including it in the tests. Signed-off-by: Boris Ranto Gbp-Pq: Name armhf-ftbfs.patch --- src/test/librbd/operation/test_mock_ResizeRequest.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/librbd/operation/test_mock_ResizeRequest.cc b/src/test/librbd/operation/test_mock_ResizeRequest.cc index e67f8a2a8..7b70a50e8 100644 --- a/src/test/librbd/operation/test_mock_ResizeRequest.cc +++ b/src/test/librbd/operation/test_mock_ResizeRequest.cc @@ -44,7 +44,6 @@ TrimRequest *TrimRequest::s_instance = nullptr; // template definitions #include "librbd/operation/ResizeRequest.cc" -#include "librbd/operation/TrimRequest.cc" namespace librbd { namespace operation { -- 2.30.2